repo: Drop more internally unused GFile members
authorColin Walters <walters@verbum.org>
Fri, 5 Aug 2016 11:08:14 +0000 (07:08 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Mon, 8 Aug 2016 08:31:59 +0000 (08:31 +0000)
I forgot to actually remove `config_file` in the previous
commit, the txn lock hasn't been used in a long time, and
for the uncompressed cache, everything uses the fd already.

Closes: #433
Approved by: giuseppe

src/libostree/ostree-repo-private.h
src/libostree/ostree-repo.c

index e20e74555166b173f0ec4d551ac746999b8e1f05..92d8a08494401f049a296ab936f68b59dd957d42 100644 (file)
@@ -75,13 +75,10 @@ struct OstreeRepo {
   char  *cache_dir;
   int objects_dir_fd;
   GFile *deltas_dir;
-  GFile *uncompressed_objects_dir;
   int uncompressed_objects_dir_fd;
-  GFile *config_file;
   GFile *sysroot_dir;
   char *remotes_config_dir;
 
-  GFile *transaction_lock_path;
   GHashTable *txn_refs;
   GMutex txn_stats_lock;
   OstreeRepoTransactionStats txn_stats;
index 27b16fe2f4d9800160a6c29cf31b728adb143930..62415f0690f02b3b47bd224728dd9c2a1cf63c87 100644 (file)
@@ -523,14 +523,11 @@ ostree_repo_finalize (GObject *object)
   if (self->objects_dir_fd != -1)
     (void) close (self->objects_dir_fd);
   g_clear_object (&self->deltas_dir);
-  g_clear_object (&self->uncompressed_objects_dir);
   if (self->uncompressed_objects_dir_fd != -1)
     (void) close (self->uncompressed_objects_dir_fd);
   g_clear_object (&self->sysroot_dir);
   g_free (self->remotes_config_dir);
 
-  g_clear_object (&self->transaction_lock_path);
-
   if (self->loose_object_devino_hash)
     g_hash_table_destroy (self->loose_object_devino_hash);
   if (self->updated_uncompressed_dirs)
@@ -611,7 +608,6 @@ ostree_repo_constructed (GObject *object)
   self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp");
 
   self->deltas_dir = g_file_get_child (self->repodir, "deltas");
-  self->uncompressed_objects_dir = g_file_get_child (self->repodir, "uncompressed-objects-cache");
 
   /* Ensure the "sysroot-path" property is set. */
   if (self->sysroot_dir == NULL)